Typo.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ac8adc89ea558c96eff7effed0550d591464e990..788c2b83c479cc7cbc90d9807a1c04143fdefabf 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -9,7 +9,6 @@
        * complete.el (PC-expand-many-files): Try be more careful when parsing
        the shell's output.
 
->>>>>>> 1.9228
 2006-03-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * outline.el (hide-sublevels): Provide better interactive default.